Autogenerated HTML docs for v1.6.6-rc2-5-g49666
diff --git a/RelNotes-1.6.5.6.txt b/RelNotes-1.6.5.6.txt new file mode 100644 index 0000000..a9eaf76 --- /dev/null +++ b/RelNotes-1.6.5.6.txt
@@ -0,0 +1,23 @@ +Git v1.6.5.6 Release Notes +========================== + +Fixes since v1.6.5.5 +-------------------- + + * "git add -p" had a regression since v1.6.5.3 that broke deletion of + non-empty files. + + * "git archive -o o.zip -- Makefile" produced an archive in o.zip + but in POSIX tar format. + + * Error message given to "git pull --rebase" when the user didn't give + enough clue as to what branch to integrate with still talked about + "merging with" the branch. + + * Error messages given by "git merge" when the merge resulted in a + fast-forward still were in plumbing lingo, even though in v1.6.5 + we reworded messages in other cases. + + * The post-upload-hook run by upload-pack in response to "git fetch" has + been removed, due to security concerns (the hook first appeared in + 1.6.5).
diff --git a/RelNotes-1.6.6.txt b/RelNotes-1.6.6.txt index 8f9d4f5..059e9c3 100644 --- a/RelNotes-1.6.6.txt +++ b/RelNotes-1.6.6.txt
@@ -223,22 +223,6 @@ All of the fixes in v1.6.5.X maintenance series are included in this release, unless otherwise noted. - * Enumeration of available merge strategies iterated over the list of - commands in a wrong way, sometimes producing an incorrect result. - Will backport by merging ed87465 (builtin-merge.c: call - exclude_cmds() correctly., 2009-11-25). - - * "git format-patch revisions... -- path" issued an incorrect error - message that suggested to use "--" on the command line when path - does not exist in the current work tree (it is a separate matter if - it makes sense to limit format-patch with pathspecs like that - without using the --full-diff option). Will backport by merging - 7e93d3b (format-patch: add test for parsing of "--", 2009-11-26). - - * "git shortlog" did not honor the "encoding" header embedded in the - commit object like "git log" did. Will backport by merging 79f7ca0 - (shortlog: respect commit encoding, 2009-11-25). - --- exec >/var/tmp/1 echo O=$(git describe master)
diff --git a/git-upload-pack.html b/git-upload-pack.html index 0d70d22..2ee5c0d 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html
@@ -330,8 +330,6 @@ The UI for the protocol is on the <em>git-fetch-pack</em> side, and the program pair is meant to be used to pull updates from a remote repository. For push operations, see <em>git-send-pack</em>.</p></div> -<div class="para"><p>After finishing the operation successfully, <tt>post-upload-pack</tt> -hook is called (see <a href="githooks.html">githooks(5)</a>).</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> @@ -376,7 +374,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-12-03 09:12:52 UTC +Last updated 2009-12-11 06:00:54 UTC </div> </div> </body>
diff --git a/git-upload-pack.txt b/git-upload-pack.txt index 63f3b5c..b8e49dc 100644 --- a/git-upload-pack.txt +++ b/git-upload-pack.txt
@@ -20,8 +20,6 @@ program pair is meant to be used to pull updates from a remote repository. For push operations, see 'git-send-pack'. -After finishing the operation successfully, `post-upload-pack` -hook is called (see linkgit:githooks[5]). OPTIONS -------
diff --git a/git.html b/git.html index c72dc24..88e7eb7 100644 --- a/git.html +++ b/git.html
@@ -2069,7 +2069,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-12-06 04:02:42 UTC +Last updated 2009-12-11 06:00:54 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index ad6037b..3d0cbf6 100644 --- a/git.txt +++ b/git.txt
@@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.5.5/git.html[documentation for release 1.6.5.5] +* link:v1.6.5.6/git.html[documentation for release 1.6.5.6] * release notes for + link:RelNotes-1.6.5.6.txt[1.6.5.6], link:RelNotes-1.6.5.5.txt[1.6.5.5], link:RelNotes-1.6.5.4.txt[1.6.5.4], link:RelNotes-1.6.5.3.txt[1.6.5.3],
diff --git a/githooks.html b/githooks.html index 55ffc29..324911a 100644 --- a/githooks.html +++ b/githooks.html
@@ -554,54 +554,6 @@ <div class="para"><p>Both standard output and standard error output are forwarded to <em>git-send-pack</em> on the other end, so you can simply <tt>echo</tt> messages for the user.</p></div> -</div> -<h2 id="_post_upload_pack">post-upload-pack</h2> -<div class="sectionbody"> -<div class="para"><p>After upload-pack successfully finishes its operation, this hook is called -for logging purposes.</p></div> -<div class="para"><p>The hook is passed various pieces of information, one per line, from its -standard input. Currently the following items can be fed to the hook, but -more types of information may be added in the future:</p></div> -<div class="vlist"><dl> -<dt> -want SHA-1 -</dt> -<dd> -<p> - 40-byte hexadecimal object name the client asked to include in the - resulting pack. Can occur one or more times in the input. -</p> -</dd> -<dt> -have SHA-1 -</dt> -<dd> -<p> - 40-byte hexadecimal object name the client asked to exclude from - the resulting pack, claiming to have them already. Can occur zero - or more times in the input. -</p> -</dd> -<dt> -time float -</dt> -<dd> -<p> - Number of seconds spent for creating the packfile. -</p> -</dd> -<dt> -size decimal -</dt> -<dd> -<p> - Size of the resulting packfile in bytes. -</p> -</dd> -</dl></div> -<div class="para"><p>kind string: - Either "clone" (when the client did not give us any "have", and asked - for all our refs with "want"), or "fetch" (otherwise).</p></div> <h3 id="_pre_auto_gc">pre-auto-gc</h3><div style="clear:left"></div> <div class="para"><p>This hook is invoked by <em>git-gc --auto</em>. It takes no parameter, and exiting with non-zero status from this script causes the <em>git-gc --auto</em> @@ -613,7 +565,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-12-03 09:12:54 UTC +Last updated 2009-12-11 06:00:54 UTC </div> </div> </body>
diff --git a/githooks.txt b/githooks.txt index 4cc3d13..29eeae7 100644 --- a/githooks.txt +++ b/githooks.txt
@@ -310,35 +310,6 @@ 'git-send-pack' on the other end, so you can simply `echo` messages for the user. -post-upload-pack ----------------- - -After upload-pack successfully finishes its operation, this hook is called -for logging purposes. - -The hook is passed various pieces of information, one per line, from its -standard input. Currently the following items can be fed to the hook, but -more types of information may be added in the future: - -want SHA-1:: - 40-byte hexadecimal object name the client asked to include in the - resulting pack. Can occur one or more times in the input. - -have SHA-1:: - 40-byte hexadecimal object name the client asked to exclude from - the resulting pack, claiming to have them already. Can occur zero - or more times in the input. - -time float:: - Number of seconds spent for creating the packfile. - -size decimal:: - Size of the resulting packfile in bytes. - -kind string: - Either "clone" (when the client did not give us any "have", and asked - for all our refs with "want"), or "fetch" (otherwise). - pre-auto-gc ~~~~~~~~~~~
